Fix C++ comment.

2000-07-19  Tor Lillqvist  <tml@iki.fi>

* gtk/gtksignal.c: Fix C++ comment.

* gtk/gtkimmulticontext.c
* gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
don't return value from void functions.

* gtk/gtk.def: Add gtk_rc_style_unref.

diff --git a/ChangeLog b/ChangeLog
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f7e61ef416983b9270db415155b6a09067d14ede..5ce13a710eaa97b4016b848087abf1e270264223 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,13 @@
+2000-07-19  Tor Lillqvist  <tml@iki.fi>
+
+       * gtk/gtksignal.c: Fix C++ comment.
+
+       * gtk/gtkimmulticontext.c
+       * gtk/gtktextbtree.c: Remove gccisms: Don't use __FUNCTION__,
+       don't return value from void functions.
+
+       * gtk/gtk.def: Add gtk_rc_style_unref.
+
 2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
 
        * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,

diff --git a/gtk/gtk.def b/gtk/gtk.def
index 455adc02b6ed3f6761dd856b0b940471a664423f..f5ea0d165bd2f8c1d471c164b7f25f1b8f538cbb 100755 (executable)
--- a/gtk/gtk.def
+++ b/gtk/gtk.def
@@ -981,6 +981,7 @@ EXPORTS
        gtk_rc_set_image_loader
        gtk_rc_style_new
        gtk_rc_style_ref
+       gtk_rc_style_unref
        gtk_ruler_draw_pos
        gtk_ruler_draw_ticks
        gtk_ruler_get_type

diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
index ddfd18e672d5299d340521009fa19c3275f1ac8d..1208a83938e477233761fe0e3c27fb7126aaf940 100644 (file)
--- a/gtk/gtkimmulticontext.c
+++ b/gtk/gtkimmulticontext.c
@@ -203,7 +203,7 @@ gtk_im_multicontext_focus_in (GtkIMContext   *context)
   GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
 
   if (slave)
-    return gtk_im_context_focus_in (slave);
+    gtk_im_context_focus_in (slave);
 }
 
 static void
@@ -213,7 +213,7 @@ gtk_im_multicontext_focus_out (GtkIMContext   *context)
   GtkIMContext *slave = gtk_im_multicontext_get_slave (multicontext);
 
   if (slave)
-    return gtk_im_context_focus_out (slave);
+    gtk_im_context_focus_out (slave);
 }
 
 void

diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 47902f7175cbdcae6444784effcf7f981f8d48b5..292315e3d3a17cdc7312e3e9454d599db593c5e3 100644 (file)
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1994,7 +1994,7 @@ gtk_signal_collect_params (GtkArg        *params,
   return_type = GTK_FUNDAMENTAL_TYPE (return_type);
   if (return_type != GTK_TYPE_NONE)
     {
-      if (return_type != 0) // FIXME: check for IS_PARAM
+      if (return_type != 0) /* FIXME: check for IS_PARAM */
        {
          GTK_VALUE_POINTER (*params) = va_arg (var_args, gpointer);
          

diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index ee2afb1c31fab30c38c5cb49337351aa62ca0d14..8c2b3e00afb1270a1fe4525da23e7965365cfaed 100644 (file)
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -1375,8 +1375,8 @@ gtk_text_btree_get_view_size (GtkTextBTree *tree,
   g_return_if_fail(tree != NULL);
   g_return_if_fail(view_id != NULL);
   
-  return gtk_text_btree_node_get_size(tree->root_node, view_id,
-                                      width, height);  
+  gtk_text_btree_node_get_size(tree->root_node, view_id,
+                              width, height);  
 }
 
 /*
@@ -5925,8 +5925,8 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
     }
   if (num_chars != node->num_chars)
     {
-      g_error("%s: mismatch in num_chars (%d %d)",
-              __FUNCTION__, num_chars, node->num_chars);
+      g_error("gtk_text_btree_node_check_consistency: mismatch in num_chars (%d %d)",
+              num_chars, node->num_chars);
     }
 
   for (summary = node->summary; summary != NULL;
@@ -6134,7 +6134,7 @@ gtk_text_btree_check (GtkTextBTree *tree)
     }
   if (node->num_chars < 2)
     {
-      g_error("%s: less than 2 chars in tree", __FUNCTION__);
+      g_error("gtk_text_btree_check: less than 2 chars in tree");
     }
   while (node->level > 0)
     {